From: Florian Müllner <fmuellner@gnome.org>
Date: Sat, 12 Sep 2020 16:27:45 +0000 (+0200)
Subject: systemActions: Flatten folded search terms
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~655^2^2~37
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=59ade00b942c0a739e761166f0ee4a21fab034da;p=gnome-shell.git

systemActions: Flatten folded search terms

GLib.str_tokenize_and_fold() returns an array rather than a string
(the "tokenize" bit), so flatten the folded search terms like we
do for keywords.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3169
---

diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
index e3b910a58..4c2f3a290 100644
--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@@ -266,7 +266,8 @@ const SystemActions = GObject.registerClass({
 
     getMatchingActions(terms) {
         // terms is a list of strings
-        terms = terms.map(term => GLib.str_tokenize_and_fold(term, null)[0]);
+        terms = terms.map(
+            term => GLib.str_tokenize_and_fold(term, null)[0]).flat(2);
 
         let results = [];